bitkeeper revision 1.305 (3f0ad9699KfMwoWJj6740b_r6vxE9Q)

Mergs some of Keir's fixes.

diff --cc xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
index 69577000e0c55eef0b38df75d5389157d88d999b,218f6549d568920fd5f68efcff09eb08fc500c82..c7992095cc638b9703ceb5a7af6fef4eab09834b
--- 1/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
--- 2/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
+++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c
@@@ -51,8 -45,9 +45,8 @@@ struct proc_dir_entry *xeno_base
  static struct proc_dir_entry *dom0_cmd_intf;
  static struct proc_dir_entry *dom_list_intf;
  
- unsigned long direct_mmap(unsigned long, unsigned long, pgprot_t, int, int);
+ unsigned long direct_mmap(unsigned long, unsigned long, pgprot_t, int);
  int direct_unmap(unsigned long, unsigned long);
 -int direct_disc_unmap(unsigned long, unsigned long, int);
  
  static ssize_t dom_usage_read(struct file * file, char * buff, size_t size, loff_t * off)
  {

diff --cc xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c
Simple merge